From c6a3252083d653c911356d5ed59f9783e65c3d4a Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 1 Sep 2009 11:32:47 +0100 Subject: [PATCH] [IA64] Further irq-vector fix. Signed-off-by: KUWAMURA Shin'ya Signed-off-by: Xiantao Zhang --- xen/drivers/passthrough/vtd/iommu.c | 4 ++++ xen/include/asm-ia64/mach_apic.h | 1 + 2 files changed, 5 insertions(+) create mode 100644 xen/include/asm-ia64/mach_apic.h diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index ee54f35992..2f045b4dff 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -892,7 +892,11 @@ static int iommu_set_interrupt(struct iommu *iommu) irq_desc[irq].handler = &dma_msi_type; irq_to_iommu[irq] = iommu; +#ifdef CONFIG_X86 ret = request_irq(irq, iommu_page_fault, 0, "dmar", iommu); +#else + ret = request_irq_vector(irq, iommu_page_fault, 0, "dmar", iommu); +#endif if ( ret ) { irq_desc[irq].handler = &no_irq_type; diff --git a/xen/include/asm-ia64/mach_apic.h b/xen/include/asm-ia64/mach_apic.h new file mode 100644 index 0000000000..3f96d742a2 --- /dev/null +++ b/xen/include/asm-ia64/mach_apic.h @@ -0,0 +1 @@ +/* Leave it as blank for compilation. */ -- 2.30.2